From: Juanma Barranquero <lekktu@gmail.com>
Date: Sat, 1 May 2004 13:52:53 +0000 (+0000)
Subject: (help-add-fundoc-usage): Use %S instead of %s to format arglist so default
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22786
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=71ac2b77e37edf5d5d534ac1711afd816b699f1c;p=emacs.git

(help-add-fundoc-usage): Use %S instead of %s to format arglist so default
values in CL-style argument lists are correctly shown.
---

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 4e57ea6d74e..467ab0eba17 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -181,7 +181,7 @@ ARGLIST can also be t or a string of the form \"(fun ARG1 ARG2 ...)\"."
   (unless (stringp doc) (setq doc "Not documented"))
   (if (or (string-match "\n\n(fn\\(\\( .*\\)?)\\)\\'" doc) (eq arglist t))
       doc
-    (format "%s%s%s" doc
+    (format "%s%s%S" doc
 	    (if (string-match "\n?\n\\'" doc)
 		(if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "")
 	      "\n\n")
@@ -339,7 +339,7 @@ KIND should be `var' for a variable or `subr' for a subroutine."
 	  ;; FIXME: This list can be very long (f.ex. for self-insert-command).
 	  ;; If there are many, remove them from KEYS.
 	  (if (< (length non-modified-keys) 10)
-	      (princ (mapconcat 'key-description keys ", "))	      
+	      (princ (mapconcat 'key-description keys ", "))
 	    (dolist (key non-modified-keys)
 	      (setq keys (delq key keys)))
 	    (if keys